From fd4d149fb0dad9689c61689dd534121a6cdc74f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Sat, 12 Mar 2016 11:15:24 +0100
Subject: [PATCH] Ignore $BROWSER if not set

---
 src/cargo/ops/cargo_doc.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/cargo/ops/cargo_doc.rs b/src/cargo/ops/cargo_doc.rs
index e82f15da9..d2f65b827 100644
--- a/src/cargo/ops/cargo_doc.rs
+++ b/src/cargo/ops/cargo_doc.rs
@@ -56,7 +56,7 @@ pub fn doc(manifest_path: &Path,
         if fs::metadata(&path).is_ok() {
             let mut shell = options.compile_opts.config.shell();
             match open_docs(&path) {
-                Ok(m) => try!(shell.status("Opening with", m)),
+                Ok(m) => try!(shell.status("Launching", m)),
                 Err(e) => {
                     try!(shell.warn(
                             "warning: could not determine a browser to open docs with, tried:"));
@@ -75,9 +75,12 @@ pub fn doc(manifest_path: &Path,
 fn open_docs(path: &Path) -> Result<&'static str, Vec<&'static str>> {
     let mut methods = Vec::new();
     // trying $BROWSER
-    match env::var("BROWSER").map(|name| Command::new(name).arg(path).status()) {
-        Ok(_) => return Ok("$BROWSER"),
-        Err(_) => methods.push("$BROWSER")
+    match env::var("BROWSER"){
+        Ok(name) => match Command::new(name).arg(path).status() {
+            Ok(_) => return Ok("$BROWSER"),
+            Err(_) => methods.push("$BROWSER")
+        },
+        Err(_) => () // Do nothing here if $BROWSER is not found
     }
 
     for m in ["xdg-open", "gnome-open", "kde-open"].iter() {
-- 
2.30.2